Revert 2c6c695..5f03865

This rolls back to commit 2c6c695906cb7ea6f1e304e4a1bf9ff613da45eb.