Removing my changes to merge the ace based driver in and see if I can change it. This reverts commit 69d61f8433.
69d61f8433