Revert c5afe81..51dae40

This rolls back to commit c5afe81e6933e8e5a7bf567f4409799808ccf070.