Revert 919210d..ce058da

This rolls back to commit 919210d2090f5fcc1c596415ef29d66bfa5d020b.