Revert f7890aa..1230da3

This rolls back to commit f7890aa59b249eea263b9650183bc497e7fe3c10.