Revert 88aa505..b5d99b9

This rolls back to commit 88aa505dd697824a0d0a516fd3ba6db5bfe0397c.