Revert baa0e2f..5c7e0d4

This rolls back to commit baa0e2f1b1b87031f1dd1b0dd306cd151a125bff.