Revert 9c7d38b..b6820ba

This rolls back to commit 9c7d38bda9b59cd734f98c1e8200d9d5768adfdb.