Revert 6b2f7c0..89ab723

This rolls back to commit 6b2f7c0aba4aa655fcc30206db56ff47390b5c19.