reverts timing fix - this is handled by the framework now