Engine: revert PR #404 until a final solution is found for this case and Shows