Revert fcc1961..de4637e

This rolls back to commit fcc19615271655bd6748e1631aba157d43a214c9.