Revert 1901160..49c8dc6

This rolls back to commit 19011605dcc89a6b47663dfc44cf9ba1a01030be.
clumsy merge