Removed a temporary hack.