This reverts commit e249ee70 added in !3 (merged) by mistake
The changes from that commit are tracked in !1 (merged) instead
