MBS-6822: Revert "MBS-6067: Always work with an inc object"

This reverts commit 67a4750556839d2671935bdc3e5b8ef6ca3776b9.