I think only test_ftu_* (within the functional tests anyway) use this. If you use inline Waits there then you can remove this entirely.