MOD: Changed the commented out implementation for something that doesn't work.