Revert 0d23477..73ebefc

This rolls back to commit 0d23477dae44d439ce58b00f3481837afe6e8d19.