[sr-dev] git:master: core: remove ifdef'ed code left over from a commit one year ago