Revert 189bafa..e3fa6f2

This rolls back to commit 189bafa97a308dcae6227947eac0b091fadd1fe0.