Revert 23b0c6a..e1421cc

This rolls back to commit 23b0c6a315e0433c0837b67d2d736037620dedf4.