Revert 47b7da1..a31e455

This rolls back to commit 47b7da11a3dee37e00fd746d3b73c898504edc0a.