Revert 33c7c2c..404ccbf

This rolls back to commit 33c7c2cdec60abac79fb30e75a9c19d291a16f0e.