Revert 9e2c7f6..b501a6c

This rolls back to commit 9e2c7f6ddb3e261dfaa42e272e337586657b0159.