Revert 5468571..c14178f

This rolls back to commit 54685716efbaec2186d2d719fe4934fc2882d1e6.