Merge "Revert "Timing hacks DO NOT MERGE"" into lmp-dev