Revert a18881f..c238b82

This rolls back to commit a18881f68722a72d1df083f768b42489a7feb9fc.