Removing deferred workaround that is no longer necessary.