Revert 9269cc6..1adceff

This rolls back to commit 9269cc6d408d06ec7826e521e3b0fc6b6ab9ec7d.