revert previous fix since RC0 changed again