Revert 027d78a..b7ee67a

This rolls back to commit 027d78a70a9b861d74cfdcf900b43c029d98336d.