Revert "Original OVLMake 0.6 commit"

This reverts commit b14ae0c182beec480f68541a730b33369b339603.