Revert 94466a9..b4a6183

This rolls back to commit 94466a96e58de4a2c34e3aeaf210c16e2353a31f.