Revert 1ecc913..bd9f6b8

This rolls back to commit 1ecc9130903c2f7abed8b16b4c1896ad8d6ea3d5.
on999