Fixes #14524 (closed).
Unsure if we want to do this though. Thoughts @cvrebert and @fat?
/cc @silvenon