Revert Jirafe Override issue introduced in 0ad38fb7