Revert 6575b22..a0cccad

This rolls back to commit 6575b226cff0af69352910aa239dd98ed75200bd.