Merge pull request #962 from e-liner/occ_revert

Reverting occ changes that were incorrectly merged