master is now 5.4+, so this stuff can go