Revert 49f780c..8844505

This rolls back to commit 49f780c0f49dc9a926db4bd9a1c68e07d67d33f6.