Revert af670c7..ce0bf7d

This rolls back to commit af670c7429aae3e3af0770e731d68aee4fe1778e.