Revert d754dcb..af0173f

This rolls back to commit d754dcb0ae7e69558493ea552ec38c69666beb8e.
Revert af0173f..4b1c87c

This rolls back to commit af0173fc3bb983a89db3d0454474d06d028635fb.