Revert bbe9afa..7f0b731

This rolls back to commit bbe9afaf99c1f8a04cea5a5923a811ab4a1ea1ac.