Revert c2fafff..755dfc4

This rolls back to commit c2fafffb91b14502ff861f8a740a034fc321fd32.