Revert 2383fe1..46748d9

This rolls back to commit 2383fe1bf61805845821ed0106c1d3f4bef27c19.