This reverts commit 2947ff6430da5d60017b0c5c8c51fd2a1d85440b, which would have caused too many rebuilds for 'master'.