Revert 7612a40..49826d6

This rolls back to commit 7612a4092bf152926ec7d46f478250974dba4028.