Revert 60b5543..c2500ea

This rolls back to commit 60b55436889ad0bf9f2938bc818e64671d59fc91.
ag