Revert 1005df7..7abacf9

This rolls back to commit 1005df7591abfda8ce944d75f745912bef869757.