Revert 9ba0906..44f93c2

This rolls back to commit 9ba090695ee5e8aa26f39152f78271dbc217e342.