Repairing for a merge gone bad earlier today (5b2181b). This was done by reverting commits on a separate branch until we managed to revert the bad merge, and then cherry-picking that revert back into a fix branch that will then be merged to dev.