The workaround mentioned is already in the upstream trees for 4.5.1 and 4.4.3, and hence will become available eventually via maintenance update.