Revert 4980dc3..6dc3f3a

This rolls back to commit 4980dc303a8676fb86a987e936192f7caee1656c.