Revert 155d898..7951d48

This rolls back to commit 155d898d9c400a98d9cd680f7ebbec2d682db80d.