Reverted patch from David Chisnall to bring back Lucid to a working state.