Revert "Regression merge"

This reverts commit 78e12660ce093c8692755fd12285081edefc7dcf.
Regression update