[COMMIT] Fix trunk problems caused by my latest commit