Revert 1183022 - it seems, that this does not work as intended