Revert 9454ef1..5e4326c

This rolls back to commit 9454ef107b53d49a177a3660be143cbf75168e51.