Test regressions not included this time :) This reverts commit 1ed671082ef4b13d44e2c0f42ddedf9d450258a7.