Revert 2641309..ea59363

This rolls back to commit 264130948507cf3d4617962f19dab8fba5c13fb6.