Something went really wrong with the merge at e0e8c0d3. As a result, changes made by @dave where reverted in the merge. This commit restores those changes