This reverts commit c7a5b962cb. Can't be build because of internal compiler errors on the builders.
c7a5b962cb