Re: rsaenh: Revert part of d3c482250a8232e9657ecefb3e61fff0194e3fbe