Revert 4477317..f8dd0d9

This rolls back to commit 447731717a952656fc317eba71d788605cec788f.