Revert 1118247..943def7

This rolls back to commit 1118247ac1815cd428452faff16c420ae9c8d576.