Patch 3f0404aa is breaking some debugs build so we cannot use the reverse here. This reverts commit 493f1010.