Revert 1108c05..3dd321e

This rolls back to commit 1108c05bfbaa094be31e2a69b435415c6be70602.
merge try 1