Revert 11820bf..b2b7ea3

This rolls back to commit 11820bf894ea510620d37282939d17928cfd5d54.