Revert all horse changes, we need to do this in a plug-in.