Revert b3bfbe1..7853d4e

This rolls back to commit b3bfbe16736eb663608cf6541d553fe125a5ccc8.