Use functionality in master instead of providing our own.