Fix backwards compatibility for @387ab4e