Revert f7e2e5c..4b1e158

This rolls back to commit f7e2e5c93940153b9496e6516fa4a8f452c82ae1.