Revert 5ad64c1..ceff29a

This rolls back to commit 5ad64c179f5ece74ae69244e01af98a35e7fdaf9.