Revert 08ded1a..f80635c

This rolls back to commit 08ded1a284def99fc6899042052c9f5c73795dcc.
Squiz updates merged down into local variant