Revert "Bandaids for master"

This reverts commit b6e5eb3c453ea914aa19126248c808e3ff331f14.