This hinders the following commits. This was only used in a single
plugin on a single platform, and was poorly designed.