This patch broke installation of a new master. Reverting until
we develop a better solution.
This reverts commit f42da4357e.
This patch broke installation of a new master. Reverting until
we develop a better solution.
This reverts commit f42da4357e.