This causes too many rebuilds for the master branch. This reverts commit 331aaf52806b27430c4efaf8f230097ede69e61a.