reverted previous changed as it broke tests