Revert 162067f..1052363

This rolls back to commit 162067f5324664a643f835202892e99a15a3030c.