Revert effects of Endri's commit #9641ac4