Revert ca4134c..cd5bc32

This rolls back to commit ca4134c50cc251c699af6e7d7d63af72d978b1c7.