Revert e3fc671..9dc4f74

This rolls back to commit e3fc671350fd19926c89053ebcc59b69ef25b68e.