Revert previous change, Compass is buggy :(