Remove an implementation limitation related to shifts