After the previous commit, the optimization is no longer needed, and unnecessarily bloats the uniform buffer. This reverts commit 62bcb1785e809649ba88b49e24c5217f457fa040.