Unbreak stuff. Thank god this isn't anywhere near release...