Reverted last commit until Travis supports 5.5.5