Revert 2dd6709..fe59568

This rolls back to commit 2dd6709939f1b9f996e18c81019fb79135420791.