REVERT: Previous fix was broken, needs more work