Upstream patch, does not apply cleanly: https://github.com/toddlipcon/tlipcon-bin/commit/1ff04b6b118016999373c68cc3a918d7b0b25387