Revert 4c9c029..cf260b0

This rolls back to commit 4c9c029f99f1e1cda36ff2f6960bd5625aa42d2a.