Revert dcb8d6e..6aa1b5e

This rolls back to commit dcb8d6e0f8be36f0acf458ce12514e4016c044a7.