Revert 0d30e07..e1a76ce

This rolls back to commit 0d30e07b658380914c4ce7ee102c847a6a2aa097.