Revert 86d66e2..bafcde7

This rolls back to commit 86d66e216eff056b16ae9d5b919a89aa29a18ae4.