Revert 7ba0f04..f0461e9

This rolls back to commit 7ba0f04f1f5edd82080967a3a254c0dc520aa51d.