Revert 34c320c..da1243d

This rolls back to commit 34c320cd65080f13907807abd4c9603d20e2578d.