Revert 71dd7d7..1b666df

This rolls back to commit 71dd7d7c225c0cc4f20555b86e466e35b950708a.