I do think the “Master’s Plans” have been ditched in favor of a different solution. There have been a few hints about this along the way. This is the only one I can find at the moment. I also remember similar hints in one of the podcasts a while ago.