Revert 0b0abd5..0b134dc

This rolls back to commit 0b0abd55e9681eb03fbdf0d65220c8e26099208e.