Revert abfe112..92dc427

This rolls back to commit abfe11214fe89183ec81c3e23ac65a4d1555765d.