Reverting last commit as it breaks a test