Rollback getter fix as it doesn't work.