Revert 43f8345..b1d3d2e

This rolls back to commit 43f83456672a64e9df218567210944ea872ff0b9.