This reverts commit e527fc2e. I merged more than I intended in e527fc2e, I will merge D3575 and D3577 separately.