Revert "Added patches according to OSCI-846"