Remove workaround for a fixed problem