Revert dc48b2c..155b7fa

This rolls back to commit dc48b2c0d3060a0548835b43db1b18bed4d0392a.