Revert a31c84b..40279af

This rolls back to commit a31c84bf3abc135429b5aa8a9a828bbea2c58073.