Revert b99ff82..7f19d4f

This rolls back to commit b99ff823dc7668a3f6407c808322fe4509138b50.