Revert 046604c..698727f

This rolls back to commit 046604cca22f96082f09242c38e811f743ca833d.