Revert 73490a1..f3bb7ba

This rolls back to commit 73490a152abcca7db0055d764e4f98956a3f2ea6.