Revert 08e3c34..cdc1fa8

This rolls back to commit 08e3c34fcbc664279abea944c8f2c43b4217dc1d.