Revert d16b16b..7f0615f

This rolls back to commit d16b16b70c0d0ef94b3fc2916b373f55d3a49024.