Revert 64e9250..383bb88

This rolls back to commit 64e92500cfdca1246760c1ba610322a4893c7388.