Revert 5529c39..e0cd27d

This rolls back to commit 5529c3925600e32c81586dc1f67cd15d703ffd99.