Reverted accidental beta merges.