Revert "Do not fail on ODLPARENT-152"