Rolling back merge attempt until I have time to fix failing unit tests (most likely tomorrow will do it).