Revert 59b560d..761c3ab

This rolls back to commit 59b560d740c123e2d634ccb69e4e77b2c238a646.