Revert 9e27d4b..0d2e9c3

This rolls back to commit 9e27d4b9968d51c91ac2f33d4bc3783b87b554de.