Revert fad1f1e..107033c

This rolls back to commit fad1f1e9a06147d06369eb41cd2cee646167a8a2.