Revert b452ffc..cc7a856

This rolls back to commit b452ffc2a475f80c69b98671acc6daf2d5ca52c3.