Commits
Torne (Richard Coles) authored 4890b085fb4
Revert "Fix for scheduling conflicts, address fred's comments" This reverts commit 96ca46cf8726abbad46857a8af5eb83b2c04ec21 which broke building tests on master. Change-Id: I7e712d03b42cd25e22c0a8e72cf4e4526cd412e1