Revert 81a55b1..3223fa2

This rolls back to commit 81a55b10fc508b2072710125bf2a701652ebb3cc.
junk