This reverts commits 9450b836 a5cc9fcc 87b8cfc0 53ccb230 62fe9cac 2f484438 03b7539a f07f8194 e39b2106 cdb7a1d0
Reverts !1403 (merged)