Revert 5299b28..96cdad5

This rolls back to commit 5299b28c52695c85445385e76db0b5da828d36fa.