Created by: cvrebert
/to @mdo Fixes #8702 (closed). Happy to rework this however you want, if necessary.