Revert previous change (grave key WAR).

Turns out the previous workaround was insufficient to actually make the `
completely functional on Mac. :(. Extra :(. Nuking the change and trying
something else.