Revert 6c302ca..1ddf811

This rolls back to commit 6c302ca9eb49528015bf751a33b1b43463405aae.