Revert 4646c05..842756c

This rolls back to commit 4646c0522718f3fa0dd6bd2729d2f659016a2363.