Removing workaround for Issue #2300053